Merge

diff --cc xen/arch/x86/hvm/intercept.c
index cc77241da91b330542b3d3b4e94ab0d694994437,8b32dbce82da6b268cc0ccb7e648be471221d6c9..c41a937b03ada50ddfaaea5fda5b883eb0bb654f
--- 1/xen/arch/x86/hvm/intercept.c
--- 2/xen/arch/x86/hvm/intercept.c
+++ b/xen/arch/x86/hvm/intercept.c
@@@ -215,9 -222,9 +215,9 @@@ int hvm_save(struct domain *d, hvm_doma
      hvm_put_8u(h, len);
      hvm_put_buffer(h, chgset, len);
  
 -    for(se = v->domain->arch.hvm_domain.first_se; se != NULL; se = se->next) {
 +    for(se = d->arch.hvm_domain.first_se; se != NULL; se = se->next) {
          /* ID string */
-         len = strnlen(se->idstr, HVM_SE_IDSTR_LEN);
+         len = strnlen(se->idstr, sizeof(se->idstr));
          hvm_put_8u(h, len);
          hvm_put_buffer(h, se->idstr, len);